From bfbc365faa0ce32e45bf9d0fc89920bb07b867d8 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Fri, 2 Sep 2005 17:53:52 +0000 Subject: [PATCH] Various minor vmxassist cleanups. Signed-Off-By: Leendert van Doorn --- tools/firmware/vmxassist/Makefile | 2 +- tools/firmware/vmxassist/TODO | 8 -------- tools/firmware/vmxassist/setup.c | 2 +- tools/firmware/vmxassist/vm86.c | 3 +-- tools/firmware/vmxassist/vmxloader.c | 5 +++-- 5 files changed, 6 insertions(+), 14 deletions(-) delete mode 100644 tools/firmware/vmxassist/TODO diff --git a/tools/firmware/vmxassist/Makefile b/tools/firmware/vmxassist/Makefile index e5560a9463..3c2ee4bb61 100644 --- a/tools/firmware/vmxassist/Makefile +++ b/tools/firmware/vmxassist/Makefile @@ -24,7 +24,7 @@ include $(XEN_ROOT)/tools/Rules.mk # The emulator code lives in ROM space TEXTADDR=0x000D0000 -DEFINES=-DDEBUG -DENABLE_VME -DTEXTADDR=${TEXTADDR} +DEFINES=-DDEBUG -DTEXTADDR=${TEXTADDR} XENINC=-I$(XEN_ROOT)/xen/include -I$(XEN_ROOT)/tools/libxc #DEFINES=-DDEBUG -DTEST -DTEXTADDR=${TEXTADDR} #XENINC=-I/home/leendert/xen/xeno-unstable.bk/xen/include diff --git a/tools/firmware/vmxassist/TODO b/tools/firmware/vmxassist/TODO deleted file mode 100644 index 2378ff3485..0000000000 --- a/tools/firmware/vmxassist/TODO +++ /dev/null @@ -1,8 +0,0 @@ - -- Use the VME extensions (interrupt handling) - -- Use E820 map in vmxassist instead of cmos hack - -- Add ACPI support (Nitin's patch) - - diff --git a/tools/firmware/vmxassist/setup.c b/tools/firmware/vmxassist/setup.c index 19324d1d5c..a83705f449 100644 --- a/tools/firmware/vmxassist/setup.c +++ b/tools/firmware/vmxassist/setup.c @@ -353,7 +353,7 @@ main() #endif setup_gdt(); setup_idt(); -#ifdef ENABLE_VME +#ifndef TEST set_cr4(get_cr4() | CR4_VME); #endif setup_ctx(); diff --git a/tools/firmware/vmxassist/vm86.c b/tools/firmware/vmxassist/vm86.c index e3fcaa5276..27b0bf6340 100644 --- a/tools/firmware/vmxassist/vm86.c +++ b/tools/firmware/vmxassist/vm86.c @@ -465,8 +465,7 @@ movcr(struct regs *regs, unsigned prefix, unsigned opc) * Emulate a segment load in protected mode */ int -load_seg(unsigned long sel, unsigned long *base, unsigned long *limit, - union vmcs_arbytes *arbytes) +load_seg(unsigned long sel, u32 *base, u32 *limit, union vmcs_arbytes *arbytes) { unsigned long long entry; diff --git a/tools/firmware/vmxassist/vmxloader.c b/tools/firmware/vmxassist/vmxloader.c index 85ea064056..c2273f3ca1 100644 --- a/tools/firmware/vmxassist/vmxloader.c +++ b/tools/firmware/vmxassist/vmxloader.c @@ -110,8 +110,8 @@ main() } #ifdef _ACPI_ puts("Loading ACPI ...\n"); - if (ACPI_PHYSICAL_ADDRESS+sizeof(acpi) <= 0xF0000 ){ - /* make sure acpi table does not overlap rombios + if (ACPI_PHYSICAL_ADDRESS+sizeof(acpi) <= 0xF0000 ){ + /* make sure acpi table does not overlap rombios * currently acpi less than 8K will be OK. */ memcpy((void *)ACPI_PHYSICAL_ADDRESS, acpi, sizeof(acpi)); @@ -122,5 +122,6 @@ main() memcpy((void *)TEXTADDR, vmxassist, sizeof(vmxassist)); puts("Go ...\n"); ((void (*)())TEXTADDR)(); + return 0; } -- 2.30.2